Correctly render package private defs when package has parts

build.sbt

@@ -622,21 +622,23 @@ def collectBindings(headersPath: File) = {
     )
     .toMap
 
-  headerSpec.toSeq.map { case (header, name) =>
-    val PREF = "//!bindgen"
-    val contents = IO
-      .readLines(header)
+  def directives(pref: String, lines: List[String]): List[String] =
+    lines
       .map(_.trim)
-      .filter(_.startsWith(PREF))
-      .map(_.stripPrefix(PREF).trim)
+      .filter(_.startsWith(pref))
+      .map(_.stripPrefix(pref).trim)
       .flatMap(_.split(" "))
       .map(_.trim)
 
+  headerSpec.toSeq.map { case (header, name) =>
+    val lines = IO.readLines(header)
+    val contents = directives("//!bindgen:", lines)
+    val pkg = directives("//!bindgen-package:", lines).headOption
     val multiFileFlag = "--multi-file"
     val isMultiFile = contents.contains(multiFileFlag)
 
     Binding
-      .builder(header, s"lib_test_$name")
+      .builder(header, pkg.getOrElse(s"lib_test_$name"))
       .addCImport(s"$name.h")
       .withBindgenArguments(contents.filterNot(_ == multiFileFlag))
       .withMultiFile(isMultiFile)

modules/bindgen/src/main/scala/render/binding.scala

@@ -396,16 +396,17 @@ private def renderEnumerations(
     if mode == RenderMode.Objects then out.appendLine("object predef:")
     nestIf(mode == RenderMode.Objects) {
 
+      val safePackageName = packageName.split('.').last
       val predefSigned = s"""
-        |private[$packageName] trait CEnum[T](using eq: T =:= Int):
+        |private[$safePackageName] trait CEnum[T](using eq: T =:= Int):
         |  given Tag[T] = Tag.Int.asInstanceOf[Tag[T]]
         |  extension (inline t: T) 
         |    inline def int: CInt = eq.apply(t)
         |    inline def value: CInt = eq.apply(t)
        """.stripMargin.trim.linesIterator
 
       val predefUnsigned = s"""
-        |private[$packageName] trait CEnumU[T](using eq: T =:= UInt):
+        |private[${safePackageName}] trait CEnumU[T](using eq: T =:= UInt):
         |  given Tag[T] = Tag.UInt.asInstanceOf[Tag[T]]
         |  extension (inline t: T)
         |   inline def int: CInt = eq.apply(t).toInt
@@ -463,8 +464,9 @@ private def renderScalaFunctions(
         summon[Config].linkName.foreach { l =>
           out.append(s"""@link("$l")""")
         }
+        val safePackageName = packageName.split('.').last
         out.appendLine(
-          s"\n@extern\nprivate[$packageName] object extern_functions:"
+          s"\n@extern\nprivate[$safePackageName] object extern_functions:"
         )
         nest {
           if renderMode == RenderMode.Objects then

modules/bindgen/src/main/scala/render/function.scala

@@ -21,7 +21,8 @@ def renderFunction(f: GeneratedFunction.ScalaFunction, line: Appender)(using
   val flatArguments = f.arguments.flatten
 
   val access =
-    if f.public then "" else s"private[${summon[Context].packageName.value}] "
+    if f.public then ""
+    else s"private[${summon[Context].packageName.value.split('.').last}] "
 
   if f.public then f.meta.foreach(renderComment(line, _))
   f.body match

modules/export-tests/library/src/main/c/export_basics.h

@@ -1,4 +1,4 @@
-//!bindgen --export
+//!bindgen: --export
 
 extern int myscalalib_exports(int i, int r);
 

modules/tests/src/test/resources/scala-native/multi_file.h

@@ -1,4 +1,4 @@
-//!bindgen --multi-file
+//!bindgen: --multi-file
 
 union Test {
   int x;

modules/tests/src/test/resources/scala-native/package_tests.c

@@ -0,0 +1,3 @@
+int help_me(char c) {
+  return 25 + c;
+}

modules/tests/src/test/resources/scala-native/package_tests.h

@@ -0,0 +1,3 @@
+//!bindgen-package: lib_test.mty.bla
+
+int help_me(char c);

modules/tests/src/test/resources/scala-native/package_tests_multifile.h

@@ -0,0 +1,4 @@
+//!bindgen: --multi-file
+//!bindgen-package: lib_test.mty.bla.multi
+
+int help_me_multi(char c);