fix namespace null problems

Fraunhofer-AISEC · Nov 29, 2024 · 4bc31b5 · 4bc31b5
1 parent 2eece6b
commit 4bc31b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...guage-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileFrontend.kt b/...guage-ini/src/main/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileFrontend.kt
@@ -89,11 +89,16 @@ class IniFileFrontend(language: Language<IniFileFrontend>, ctx: TranslationConte
          * [de.fraunhofer.aisec.cpg.TranslationConfiguration.topLevel] using
          * [Language.namespaceDelimiter] as a separator
          */
-        val topLevel = (config.topLevel?.let { file.relativeToOrNull(it) } ?: file).parent
+        val topLevel = config.topLevel?.let { file.relativeToOrNull(it) } ?: file
+        val parentDir = topLevel.parent
+
         val namespace =
-            (topLevel.toString().split("/") + file.nameWithoutExtension).joinToString(
-                language.namespaceDelimiter
-            ) // TODO: Windows?
+            if (parentDir != null) {
+                val pathSegments = parentDir.toString().split(File.separator)
+                (pathSegments + file.nameWithoutExtension).joinToString(language.namespaceDelimiter)
+            } else {
+                file.nameWithoutExtension
+            }
 
         val tud = newTranslationUnitDeclaration(name = file.name, rawNode = ini)
         scopeManager.resetToGlobal(tud)

diff --git a/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileTest.kt b/cpg-language-ini/src/test/kotlin/de/fraunhofer/aisec/cpg/frontend/configfiles/IniFileTest.kt
@@ -54,11 +54,10 @@ class IniFileTest : BaseTest() {
         val namespace = tu.namespaces.firstOrNull()
         assertNotNull(namespace)
         assertFullName(
-            listOf("src", "test", "resources", "config")
-                .joinToString(tu.language?.namespaceDelimiter ?: "."),
+            "config",
             namespace,
             "Namespace name mismatch."
-        )
+        ) // analyzeAndGetFirstTU does not provide the full path
 
         assertEquals(2, tu.records.size, "Expected two records")